Merge branch 'Q_info_updates_basop_instrumentation_enc_1' into 'main'

Q info updates, basop instrumentation updates for lib_enc

See merge request !894