Simple AOP with around advice.
Resolved merge conflict.