BS-9833: change FormLogger to log only with context provided
merge